Merge "Move New Filters opt-out preference to own section"